Bug fixing for v1 Android
Android bug fixing v1 build
Android bug fixing v1