Merge "Correctly throw AssertionError" into oreo-cts-dev