Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: 1540a79a8b am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp