Merge "Add an Executor for the onConnectedListener"
am: 0d1f7933a3

Change-Id: Ie1075238c6339c7964c14ef82f6db2d499ca03a3