Merge "Atoms: Mobile Connection" into pi-dev