Merge "Change autoFillHint to list of strings"