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

Change-Id: I6dfd5f906a642ad374a7837742812ba422075bab