New branch for android 8+ versions