Merge "Implement ConnectivityService TODO and fix many race conditions" into oc-mr1-dev
am: 49b8850cd1

Change-Id: I5729967b3009cb541e586df8117fca3cee860feb