Merge "Update OWNERS for some server/pm/User files" am: 26ba7c0911
am: 12b5e9f4c4

Change-Id: Id1a0e3a44bf9f2dcff1860bce54aff3739b2f310