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

Bug: 38173575
Change-Id: I883340c6b90bd41580222d295cdb8fe8da2d6745