4.3 fixes

Change-Id: Ia06210772d21e2d72e297194481184e4d1e8ae27
Merge remote-tracking branch 'pa/jb43' into jellybean-legacy