Merge "Merge "Atoms: Mobile Connection" into pi-dev am: dba47fcd09" into pi-dev-plus-aosp