Merge "Add a Developer option of "Disable automatic update"." into nyc-dev