Merge "Limit data usage request per uid" into tm-dev