Merge "Return false instead of throwing SecurityException for revoked case" into main