Merge 6db24238467be48a92b24babf9a10a0cf28789dd on remote branch

Change-Id: Ie6156ac2006047a24e3e6a2951ade9b78bb8f004