Merge 78467d1d8afaf5967ff1743f08598ac84377b5c5 on remote branch

Change-Id: I6fc4a907fc7911cdb60759dd85d354458ac41c49