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

Change-Id: If7e8310306889b38527bfab65316a50807814372