Merge "Clean spec to deal with rename of auto_fill to autofill"