Merge 0ce7365ef74619f7700f339264536fcce7c8103f on remote branch

Change-Id: Ica693fb289290d02ec7d38efb234fd2d3ca3b136