Non recursive appBundle replacements for android + Misc bug fixes.