Merge "Add PrepareUpdateService." am: 2e33cbeb20
am: 1811a6b734

Change-Id: Ibaf4cb155fe3f7043c53d070e4e05ee3c33b6721