Merge "Triggering quiescent reboot during OTA" into oc-dev am: d9417c53e0
am: a376eed263

Change-Id: I9796f43fc6dd78f40883c154f0e77f5b438e6bd8