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