Merge "Cleaned up wording around "valid" and "formattable"."
am: e953507051

Change-Id: Ife3bbae0a6e7ff2b788d482967f80e4308b46e80