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

Change-Id: I0c981bc36d6caf6ffdc64fa9a761cf905b9b4089