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

Change-Id: I149604f760a00b5a524d0954dc43fbd62be47b10