CL-63364: the temporary patch scheme for 4.0.

Change-Id: If681fadff57a423717a1a1aa3167b41ca2c1d38a