Partly code freeze push too 1.5

shortly before release code freeze

Change-Id: I867e7085dd46e7a4d3d1b6d69704a60e5321d75d