[1.7.x] Fixed #22625 -- Normalized make_aware/naive errors.

Also added tests for is/make_aware/naive.

Thanks Tom Michaelis for the report.

Backport of fa89acf from master