Merge "Cache results of getProfileParent calls"
am: e2c4b5296a

Change-Id: Iaa0fed5c9e54607727fcd6b3e5246cce4da7c8e2