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