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

Change-Id: I7da336fa51761f133c633a9ba9997c99772b1e9c