Bring up to 4.3

Credits to Juansheng

Change-Id: I152885bd2c03dcc7035dd53a2614c224a7317475