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

Change-Id: Icda0be79e45ac0c61ed0051e6c2a8fc468042024