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

Change-Id: I906a715f21297d87b8ecc55313690998f344b726