Merge "Speed up and reenable test for b/141603906"
am: 58578023dc

Change-Id: Icbe88e4a9ea179b7fa105c7ee5346b3d22b6acc5