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

Change-Id: I97c669cf1e3fd5930d14bc67398c2d2a804ace66