Merge "Adding support for quiescent reboot to recovery"
am: 0481faef77

Change-Id: I79e31282bd133e0de5b0f0601c5bc3bd728ddd64