Merge "Refactor profiles to use TypeReference instead of ClassReference" am: 76c7436569 am: 082690f214
am: 105b0a06a0

Change-Id: I3e62af9c824008264b88e6799bf1db4c2b4a5b2b