Merge d5abf6fef1557c57909711179522f8b490a7899a on remote branch

Change-Id: I8fc25e7e17d514362e6778de3b3d79fa8d698014