Merge remote-tracking branch 'goog/nyc-iot-dev' into nyc-iot-release

Bug: 38173575
Change-Id: I41a2d788aad34c86bbd337d4177ca8a0bebc5941