Merge 21743df4fcf5820b9b1b4ed5c8e840607ddccd45 on remote branch

Change-Id: I6d93e307a841e8bb4406a0752453192ee5235472