Merge 1dad057dd6f70ab516ecc2b8a8750968d495f9d6 on remote branch

Change-Id: Ia38a76c7a1c8103e8c24fd499eb0807a853d2a14