Merge "Add retry loop for BootImageProfileTest"