Merge 77db2569809e793043b5ceff29f287929d4cfa33 on remote branch

Change-Id: Id59e3ce8b344d76060b891f704818d6e49a8ce00