Merge "Add getProfileParentId (1/2)" am: 7a2c66359a am: b6946d8563
am: 447e453e58

Change-Id: Idd087f45d5fba325f347a8bb0391745ccd0593a0