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

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