Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev