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

Change-Id: I0b2b42d95d739701a367bd5d25bebbd64d033ad0