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

Change-Id: I1c3a3b852bd12a4310f54027b0e893feae2e0d55