Should be early enough to make this backwards-incompatible change. Change-Id: I5ef119e286cac48839c7e20acd7b5efd0513ac78