Merge "Set boot image profile properties in a loop for BootImageProfileTest" am: 33905aa38d am: c0800cfc20 am: 68d208e6fa

Change-Id: I39a6773363e49b6517cca4761b0221b5ccc3618d