Merge 9beedb7743c91f655a0574e94b50d9e019ee5924 on remote branch

Change-Id: I3cb370856faa7f00a0f2ca83f9fe60d7740b2378