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

Change-Id: Ie1d3ed859a97a3ec1353a254b22fc5f65da88b10