Merge 0d67a43f02c2c6570a4eb5aae0ab16cc3382b3d0 on remote branch

Change-Id: Ifb559bf1417d7f5f95401d6a5458304ac553b289