Merge baf78dbd65d82f052d4a5e6ce34443330aea2589 on remote branch

Change-Id: I8c4bb09a57651e16bbea7c04abf8239382056eb3