Merge "Speed up and reenable test for b/141603906" am: 58578023dc am: 24589540b2
am: 37e3d62cbc

Change-Id: I3989b33f7732880d34c5ef1df28b344c4a6751d1