Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev