Merge "Use phenotype properties for boot image profile test" am: 90dfd6b009
am: 06792d7c5c

Change-Id: Ic6cd5b600ff8b36a47489897e423b9a53ad8d611