Merge \"Add pm operation to set user restrictions.\" into nyc-dev
am: f6824b51cc

Change-Id: I355632fa26c9d85a5d41d18ca298fc704117fc48