Merge 21d4768a4fc8083b621fb90f4c47e7517fa8119f on remote branch

Change-Id: I46b86849bd8697ee3acada2586d978b395e82ef0