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

Change-Id: I812509d0fb5aa58c2ac9692934040a5585d67095