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

Change-Id: I042b254b83066a0f114f76ece040e3751a2a01e7