Merge "Enable profile key updates via profman"
am: 9174401ae4

Change-Id: Ie80928c4ae8680586ab26c08d68a554a9f790c25