Merge "Only allow the system server to connect to sync adapters" into tm-dev