Update to 4.3_r2.2

Change-Id: Iac1faaee7e0201917f95a23accb25e8ecfa595c3