Update to 4.3.1

Change-Id: I2962e9653dc02d9b056f9eae792c80205f088a0b