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