Merge 5aa1473818c1690793a29d401e432054f019bd3c on remote branch

Change-Id: Iec69bb3ce0c655b8678ce7e82f053dcab6b285ce