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

Change-Id: I546ea542d0781f825e131eb94bc54e22adadfc4e