Carry oslo-incubator review #34949.

Change-Id: I64cbecfc05e19c997411b1c7c3e0790345e2a185