Update to 4.3.1

Change-Id: I0ba514e3f1f7a9e53ac4e70dae3dd36d40c31618