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