Merge bc18385a6f4936c302ac2a69a156061919422b28 on remote branch

Change-Id: I3762326258554d6dad260b5b40240bbfc73f1588