Merge "Fix logic inversion bug for "basicGrant"." into rvc-dev am: 9bec3e33ac

Change-Id: Ie15fccf8858ec0013a798d5692891ecf6541da22