Merge bc18385a6f4936c302ac2a69a156061919422b28 on remote branch

Change-Id: Ia7c4121f806ed7326e7e38bf74db0f5b69e30138