Merge commit 'dd5078efcc62becf40294aafa502ae8e930da204' into HEAD

Change-Id: Ibb80ea32a011789ff2317039b86d10ca79159535
Signed-off-by: Anusha Shakarad <ashaka@codeaurora.org>