Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 672582e4 am: 148cc1ae am: 1c75cbb9 Change-Id: I94ba7d0a6247a518e94d004e5fb00e1e288ec8e7