Merge ab68e91a79095d1a48f4200b2885ac4927d6291e on remote branch

Change-Id: Icda1b9da4dbb8b017cf6cc11afc636d3fdb78308