Update to 4.3.1

Change-Id: Id550c9185b0fe3b8a8da68b205c9ef82267ae553