Android O MR1 IOT Release 1.0.5 (5014699)
Merge "Work around bugprone-exception-escape bug."