[Core] Android Fixes;