Merge "Merge "Correctly throw AssertionError" into oreo-cts-dev am: 9c9aafc509" into oreo-mr1-cts-dev