Merge "Fix testDataDisconnectedNotification unit test." into oc-dr1-dev am: d63df7d52e
am: dff371ecb8

Change-Id: I0397771b6e22161fc6a99e29ab64a3818478f1b5