Merge 3ad2376af9645c07a2ae526440c671d4f2f9b435 on remote branch

Change-Id: I714059e647a6e350ddefa16afc30d71506f602a4