Get inline with the android-4.2.2
Add missing badger