Merge "Remove conditional vndbinder usage in CAS." am: 231626d43d am: 897864234e
am: 905ca6a633  -s ours

Change-Id: I9470d42992400699d9f6eb2f6cb06064fe5c73b1