Merge commit 'cce31f6de8fea06821a8b57a9c0d2c687c8161f5' into nyc-dev

Bug: 27552463
Change-Id: Ieda4ab70675662ca687ac4a2e4f59f30034ffdca