Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread