Merge 1a0202d2a731c61d7945fb51b715bb1b33ef3693 on remote branch

Change-Id: I562b320f83e9b61405a2572b39332ece6715a6c8