Merge "Mark profile password key as critical." into oc-mr1-dev
am: 072b71f73f

Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1