Cleanup and more 4.3 changes

Change-Id: I173206cf28cb6040f1ac458f25939064ac5e86a6