Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev am: 0e7405fc17
am: 4cce4c5170  -s ours

Change-Id: Ib636f0fe8401f3871ce2b37f86d36740367ba196