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

Change-Id: Ie83773783fe4f18c3160c126e13266dcb0334274