DO NOT MERGE Suffix VT_LOCAL/VT_REMOTE with BIDIRECTIONAL.

Bug: 20160395
Change-Id: Id109cf1ee5206fc4a6d445716b6e5c8e20930b1c
2 files changed