Merge 46c76652e807ee098c08159f4f06419b398d0eb8 on remote branch

Change-Id: I020e324923342db1a175fffd76d13e4cb08974e5