Merge 1236151b445080796e6b3153525d9535b8d7d868 on remote branch

Change-Id: Iff28b42199fb07cc9e86de01dd8552b04a23626e