Merge 926f70d35cb9cc1b01574c18817b2d26d8fa8135 on remote branch

Change-Id: I4c0df2ca8b8d21453ac6d824b3aab17a17166bb4