Android O MR1 IOT Release 1.0.10 (5360514)
Merge "Revert "Work around bugprone-exception-escape bug.""