Merge 0f5e39d33f62b2187b98975f61de240ce8c5865f on remote branch

Change-Id: Icee702813e732fb778dd903a6d995d9ab0500890