Merge commit 'b760a3bb' into aug10d-nyc-mr2-dev

Bug: 111085900
Change-Id: Ie12be47f760402566801eb42f5defa0611a51ca2