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

Change-Id: I79184509eb1c5214be598fc9f27c5bc67c777f3b