Merge "Add retry loop for BootImageProfileTest"
am: f9cb43d6eb

Change-Id: Ie04518394d9980e1cbd87048ecc6bd7359f05625