[automerger skipped] Merge "Add test for boot image profile collection" am: eeee6f90d1 am: e0984c82a9 am: 054d35b4ee
am: b00bcdc571 -s ours
am skip reason: change_id I6bb39337ba07be58b7dc2b314a8ee92154256f17 with SHA1 f7849d916a is in history

Change-Id: I86b0c5b6ed2909a8ccd9148982289bcc7849a8c3