Merge "Add cancel button for private dns dialog" into pi-dev
am: 7fe599f542

Change-Id: I7a866a68c27503f174b7aa4fa3101264c9174ff5