Merge 00a23253f79bc22a07d316d7b6ced7a546ade71c on remote branch

Change-Id: Ifc4c8325e850d0e49ece4e5e0be4666caac36809