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

Change-Id: I88a35d1b892e3074b41e3ce5537286953723b17f