Merge f71af7d9b1e10801e650681a3af024e15588a0d5 on remote branch

Change-Id: I6ed9d0b1f1cebb195dca33c8be8e0de69865628b