DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD am: 8a2f28a629
am: 2d45ef14e5  -s ours

Change-Id: I656993de99f93cc421590ea549bd7a20fc954643