Refactor the management of profile keys am: 849439ac18
am: f5a68475f9

Change-Id: I02f59b3adbb576da5d2f84da97fbf7e07f1658bd