Merge 47a50b3891f05c1bfad535924388d49a746270de on remote branch

Change-Id: I2b841129e111a776b57d3b05f99b964976cc20f6