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

Change-Id: Ib7359ab34acecd5c8823df9087703eb5553caeba