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

Change-Id: I5e4e5effcfc58eaef9df1a29f23dce4ac553ad1e