Merge "Add phenotype property for profiling system server"
am: 62b8a2a216

Change-Id: I51d1428b2910f4bba95d1a5e2f05c979725170bb