Merge "Ensure that android.test tests pass" am: 156775fea8 am: 34dc5a58b3
am: e211119fea

Change-Id: I4692f9a86dae8bb2c5476eb477924230034cdd6b