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

Change-Id: I6c028678eb91627ae3c36db76e23f5237abf4c28