Merge "Remove conditional vndbinder usage in CAS."
am: 231626d43d

Change-Id: I29e46acf004c0314eb071c2bad23689d3105bf19