Merge "Fix logic inversion bug for "basicGrant"." into rvc-dev am: 9bec3e33 am: e55e3549 am: d9d82931 Change-Id: I19a3b53b068d1f0ffbbbd10c2e0ef04dd24d03c8