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

Change-Id: I9acc47d1db8d98aa779b0fcbb2ffeb9b4189eadd