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

Change-Id: I9d71c7abc260440804cd6d6636b57b701cb50cab