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

Change-Id: I715948b5e483cd16ad617814d85b08778aea1bcb