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

Change-Id: I5a9249d41082cd41790e45bd32727d5470c697fe