This change must be checked in together with Ic82d951237. Change-Id: I2ab451330f85a0147563b805682f26edecb71a29