Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0
am: fc64ad47f6

Change-Id: Ie7cf45469fd8d2a731c2d888027cec9ba76f1bc8