Merge "Always allow root uid to update device stats"