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