Syncing to commit 0afa2a3366307b12a213a199be1eb8baac1c5f1c. Change-Id: I6ab153008951bb7e06001c0f27f44df4e4f6cb83