Merge 47e5a3486fe902f204e74c417c338e0e975a3cbc on remote branch

Change-Id: I7299561257b5f9070b31934c54a4cd45da6a04ac