Merge 7a4812464c87c98b8be0c69618e5955dc737e157 on remote branch

Change-Id: I1e195019b18dc071f2bb069ef713ca84ad0264db