CRs-fixed: 309551 Change-Id: I42c46c62dcb4b227d9ac48146ee61cb52063a6ae Signed-off-by: Brian Gix <bgix@codeaurora.org>