Merge "Set flagForceAscii for device password entries" into oc-dev