Merge changes from topic "vpn-dialog" am: 19bb1a0b99
am: 7e75870d11

Change-Id: Ifb581e7b40d52b2378b347ff62669713be344093