This seems to get broken quite often (RDO runs something similar). Change-Id: I53fd5f86dfcee5b14318d4324c43d5f02b86702c