Merge 3a4e076ffa5f7ccb0df2e6b8b74767e7daa3289c on remote branch

Change-Id: Icb747c6a3ac5177f72645b9a05ad652e12dfd22a