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

Change-Id: Ia1487f831aa1608525d6f0d01cb6f0b10b1e0b54