Merge "Fix logic inversion bug from Android 1.0." into rvc-dev