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

Change-Id: If433c4577fd0edd3213b05befe107f7ac6adbc1a