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

Change-Id: I3fe6f4300c9321fc57479fc4a9e952d2aa0c73cc