Merge "Clear the warm_reset flag after boot is successful" am: 3fc3d75eb0
am: 9e9e9143b0

Change-Id: Ib1fe4e420b7d673cfbdb4b425ba8b9f97cbea2fc