DO NOT MERGE Suffix VT_LOCAL/REMOTE with BIDIRECTIONAL.

Bug: 20160395
Change-Id: I598f8c72041d4f514f1d5373e302194e3240ec37
2 files changed