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

Change-Id: I63bf2c7a0ec2769aaeccfd5b97677dab47975a27