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