Merge 1960921c330ce6b1a0ffdda3d47f377e0e9d1baa on remote branch

Change-Id: I1205047580b69e6895714b32bfce60b330063d8d