Merge "Mark profile password key as critical." into oc-dr1-dev
am: 56385a796e  -s ours

Change-Id: I8214883676ad022933becca76a704340558abcb1