Merge d6675b0bdedb01cf76508a52d69c808fbfbc6faf on remote branch

Change-Id: Ifc25c1ea165a39266b25576077ba54ff92a6e57e