Android build for V1.17

Android build for V1.17 with no customer selected bug fixed