Merge "Allow system server uid to bypass location restriction" into tm-dev