Merge "Don't automatically autofill when manual request returned just 1 dataset." into oc-dev am: d8d9758363
am: 4e26aa3622

Change-Id: I5697f766a83a3a3d4092f66df58e3a2ed0958435