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

Change-Id: I21781e09e3e34bf1f9c170a411a82065ed0a2532