Update to 4.3_r3.1

Change-Id: I4c3f4a00a6e14cee45497ae08dddf8dbe22c90d0