Merge "Reflect device encryption status" into oc-mr1-dev