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

Change-Id: Ie1a3cf73a1e43007fd54e96deccc90f2b33fe5dd