GPII-313: Fixing os_android_common NP set