Merge 6011f262c4aef368b921b4fd7dd26fdb9cab84f8 on remote branch

Change-Id: Id088bc780c21caadcccf1fed2428511fca8ba5c7