Removing the "Coming in 1.6 string and adding a macro for future use.

BUG=
R=kathyw@google.com

Review URL: https://codereview.appspot.com/133490043