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

Change-Id: Ia770908419fe824d9926401e5d5563edc33601fb