Fixed the android branch