Merge changes from topic "settings-vpn" am: 70f90282ef am: ff39b8ba90 am: 752013f696

Change-Id: Idac6e83bab50b818e2776f28da380f08000e2a42