DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
am: 8a2f28a629

Change-Id: I1c8cdfe6e4c052a0bee1391c9c1166868da5f6ac