Merge "Remove __INTRODUCED_IN_FUTURE."
am: ea6c19a44b

Change-Id: I5b4308b8d4a3dc54274a2da84cd3864b09d2dcf8