Merge "Refactor profiles to use TypeReference instead of ClassReference" am: 76c74365 am: 082690f2 am: 105b0a06 Change-Id: I3e62af9c824008264b88e6799bf1db4c2b4a5b2b