Merge "Add support for update-on-boot feature." into nyc-dev