Merge "Attempt native rollback for frequent crashes before boot completed"