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

Change-Id: I91644286c178da18733a8cf3acaa0881b77c9b72