Update to 4.3.1_r1

Change-Id: Ibad453ad505c8e15c52986fe9a50b91173de58b2