Merge b617277ec6a68d1601343ca76c53ee6f044d7b3a on remote branch

Change-Id: I429d8cd4b8ae29b1cecc71d54c5355cff772a330