Merge changes I0b129ec3,I49a5aee1

* changes:
  Address leftover comments of ag/18112116
  Rename vars of Ikev2VpnRunner