Merge "Fix a flaky test" am: e0aedb2ee3

Change-Id: Icb11c8ec2b2ad7175a180e5fe75ace79797715fd