Merge d6915a0ddb1c48a2acfd7ed6c296d7dbea60677a on remote branch

Change-Id: I3f80bda1396d415e69c2a272a03add8cf4f71d93