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

Change-Id: I7f72a0114e08268555b860cb32bd5fa9a8ac5acf