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

Change-Id: I99338270ac10c27b68bd851a844259441145c186