Merge changes from topic "vpn-cts" am: c75e8886ed am: e2fda73ecb am: 2b1b26ac05 am: c3a679b19a

Change-Id: I44fb40790117ae41c1468404ed2455bc9b4c4895
tree: 8f6d6f72b1f81caaf1ef09ce58a737f73e382d83
  1. tests/