Merge "Rename autoFillHint to autoFillHints." into oc-dev