Merge changes from topic "am-88210eb69d8c4cf6b06aad4274f64703" into nyc-dev
am: c280a98218

Change-Id: I83153408c85fb2def2931a18e30f8868a7c133ed