Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev am: b3029a4f72
am: 082126b397

Change-Id: I91fce8617a71c61fd38ad7117fd33c9af2a5854b