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

Change-Id: I62d02371299101a427e485d18c7ff53df74cb87e