Merge "Rename autoFillHint to autoFillHints." into oc-dev
am: 1a098cf62b

Change-Id: I8e20dac31fac8becbdd553b436a8a38312979e50