Make 4.3 work

Squashed set of commits kanged from jf

Change-Id: I2d7488e7ff060f8929f3a5ec8031472a43bafd91