Merge "Throw IAE when service add null AutofillIds on SaveInfo methods." into oc-dev