Merge "Add retry loop for BootImageProfileTest" am: f9cb43d6eb
am: 1f0c20e85f

Change-Id: I3e39338cfef91ca89c54d172a41a23a70b1e19bd