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

Change-Id: Ie336a58e84b889d8700ab64b56248f0c4933c5fa