Merge commit 'd728a508' into aug10d-nyc-dr1-dev

Bug: 111085900
Change-Id: Idc5260b874063b7a5c7fe07b95883467ed8be449