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
am: 788ddb5cee

Change-Id: I44cc8746df9e6d6215affe12c42018b2c4f8fb85