Merge "Add extra connection check on testAutoFillOneDatasetAndSave()" into oc-dev
am: 8c3b60f139

Change-Id: If92a78c9d40136d443d06957bab3d4224d3514a1