Fixed race condition with different profiles

Test: Verified that setting/getting features in one profile
does not change the other.
Fixes: 138127704
Change-Id: Id8627fc84f0d2f4ec642cfb3e9a4d9884209a91f
(cherry picked from commit a4772064dfb6c463eebb831563a7dd8182010cc2)
2 files changed