Merge "Rename autoFillHint to autoFillHints."