Ensure the user context map is editable, and remove hardcoded enable. Fixes: 178616169 Test: manual Change-Id: I54d721be7712a2efcc3695bae5ae7e44920a40ed
Ensure the user context map is editable, and remove hardcoded enable. Fixes: 178616169 Test: manual Change-Id: I54d721be7712a2efcc3695bae5ae7e44920a40ed