Merge "Add test for boot image profile collection"
am: eeee6f90d1

Change-Id: Iba20ade7b1ef3362c267a7daeb410bdb85706852