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

Change-Id: I6044413eebc96a7bc7d10ba98a30c540011a036a