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

Change-Id: I7e884fb2f5f17e9c892930e25fa981b6890a9347