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

Change-Id: I2ecb58144e80cdc44dd260a2dc41e7a1e8e1921d