[automerger skipped] Merge "Attempt native rollback for frequent crashes...
[automerger skipped] Merge "Attempt native rollback for frequent crashes before boot completed" into qt-dev
am: 37e2653b -s ours
am skip reason: change_id Ie6fb5693ff4be105bcbe139c22850fb076e40260 with SHA1 88de80fc is in history
Change-Id: I3d63b93b0966be4522a7b247bcbe66450040cdd8