Merge 3bcd7303ea9a7bef541d65814e7c80bc94579378 on remote branch

Change-Id: I3c87e446e8525b0ca5a8ef2c08e028089573e1e9