Merge "Attempt native rollback for frequent crashes before boot completed"
am: e9252285ef

Change-Id: Ia7694dbf47cf4792b9adde1158a450900e34aa62