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

Change-Id: I80e3bc47e902295785a1e999674ac4d408430a16