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

Change-Id: I86ea78d0b30cabdada332b1ca1f4dccec4ea36b3