pre code freeze for stable release 4

Change-Id: I7e8c5ba08a4364a2fb15bcd5492225d327f06995