Merge "configstore: allow to USE_CONTEXT_PRIORITY by device." am: cd712b0e8f
am: 301951f8a4

Change-Id: I92ff43ccecfc8e87e670181d45de1ffa2fa279af