[[ MERG-6.7 ]] Fixes Android issues