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

Change-Id: I175922de0767fce7423c454de321a8c86159ed2c