Merge 58d2ae06a3b4c2c1cd86ed36a1ea35e5ccffb0de on remote branch

Change-Id: I28071a6a626b62327d9d7529ccbbf377ef88e100