WIP: 4.3 fixes. DO NOT SUBMIT.

Change-Id: I2bdc7ef61dc17430a878e13dd098e6d0c004ddb2