Merge "Adjust mediadrmserver uid" into nyc-dev am: 1ba1eeca71
am: d40a5b55b8

* commit 'd40a5b55b87b9e350daaaf6b7b19014f2dfecc94':
  Adjust mediadrmserver uid