Merge "Adjust mediadrmserver uid" into nyc-dev