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

Change-Id: Ie1e0bd4029ebc2d2c8843d451f74785e21fc050c