Merge "Add phenotype property for enabling profiling of boot class path" am: eb247e7abf
am: d5f1fed45f

Change-Id: I48dc8b5b80c380ee686a109e7d2d834296631297