Merge "Prompt for confirmation before reboot if installation fails." am: 1b208af5d4 am: 05eec42808

Change-Id: I691a30f8d114b0de68ba8a7d309a130ad4b4290c