Merge "Merge "Wait for the profile to not be empty in BootImageProfileTest" am: 37f8bfb2c1 am: fdc8257eae am: a722ba3cb9 am: 5c2bd6ca18"