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

Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1