Merge "Merge "Ensure that android.test tests pass" am: 156775fe am: 34dc5a58 am: e211119f" into oc-dr1-dev-plus-aosp