am b1992b55: am e42325c7: Merge "Fix incorrect VPN time" into klp-dev

* commit 'b1992b55e967329f3bc9a63229615130761df701':
  Fix incorrect VPN time