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

Change-Id: I8cad81deb1f6568201a1775036689995e4f599fc