Update to 4.3.1

Change-Id: I684f7788947cf2761a231ed583efb74fc9481ad3