Merge "Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3 am: e211119fea" into oc-dr1-dev-plus-aosp
am: 989b7db027

Change-Id: I1e3bcb0b3607464ab2267c14ff2e8dcd96a19f56