Merge "Fix logic inversion bug for "basicGrant"." into rvc-dev am: 9bec3e33 am: bacb472d am: f8e1e9ed am: 79d5213a Change-Id: If78a0575163a7f85817a60a6292268301453aebd