Merge "Allow connecting with no requests if we're already connected." into oc-mr1-dev am: 70954f46ff
am: 3eec3be71b

Change-Id: I696971893fd053b875b6ef81ae654a85b26e597b