Merge d21c1ea674b1b8957ad20214b5546434cc7a0e07 on remote branch

Change-Id: Id3bff31f1cc0490d3c7d96703012c539ccd33cbf