Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 4d2e516a6b am: aa97661da8 am: 122b30c8ce
Change-Id: Ia4a253503310a0515bf5947da655cf4e1bd39cd3
This commit is contained in: