diff -Nru lxc-android-config-0.230+16.04.20151112/debian/changelog lxc-android-config-0.230+16.04.20160328/debian/changelog
--- lxc-android-config-0.230+16.04.20151112/debian/changelog	2016-04-05 09:06:15.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/debian/changelog	2016-04-05 09:06:15.000000000 +0000
@@ -1,9 +1,11 @@
-lxc-android-config (0.230+16.04.20151112-0ubuntu2) xenial; urgency=medium
+lxc-android-config (0.230+16.04.20160328-0ubuntu1) xenial; urgency=medium
 
-  * Call systemd-detect-virt instead of the Ubuntu specific
-    running-in-container wrapper. (LP: #1539016)
+  [ Till Kamppeter ]
+  * Removed the "-x 30" from the cupsd command line of
+    /etc/init/cups.override, as current cupsd does not support this
+    option any more.
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 28 Jan 2016 15:22:29 +0100
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 28 Mar 2016 20:50:43 +0000
 
 lxc-android-config (0.230+16.04.20151112-0ubuntu1) xenial; urgency=medium
 
diff -Nru lxc-android-config-0.230+16.04.20151112/etc/init/apport.override lxc-android-config-0.230+16.04.20160328/etc/init/apport.override
--- lxc-android-config-0.230+16.04.20151112/etc/init/apport.override	2016-04-05 09:06:15.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/etc/init/apport.override	2016-03-28 20:50:36.000000000 +0000
@@ -12,7 +12,7 @@
 
 pre-start script
     # don't start in containers
-    systemd-detect-virt --quiet --container && exit 0 || true
+    /bin/running-in-container && exit 0
 
     # Only enable crash file generation if autoreport is enabled (LP: #1494442)
     [ -e /var/lib/apport/autoreport ] || exit 0
@@ -39,7 +39,7 @@
 
 post-stop script
     # don't stop in containers
-    systemd-detect-virt --quiet --container && exit 0 || true
+    /bin/running-in-container && exit 0
 
     # Check for a hung resume.  If we find one try and grab everything
     # we can to aid in its discovery
diff -Nru lxc-android-config-0.230+16.04.20151112/etc/init/apport-reconfig.conf lxc-android-config-0.230+16.04.20160328/etc/init/apport-reconfig.conf
--- lxc-android-config-0.230+16.04.20151112/etc/init/apport-reconfig.conf	2016-04-05 09:06:15.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/etc/init/apport-reconfig.conf	2016-03-28 20:50:36.000000000 +0000
@@ -10,7 +10,7 @@
 
 pre-start script
     # don't start in containers
-    systemd-detect-virt --quiet --container && exit 0 || true
+    /bin/running-in-container && exit 0
 
     # Only enable crash file generation if autoreport is enabled (LP: #1494442)
     [ -e /var/lib/apport/autoreport ] || exit 0
@@ -21,7 +21,7 @@
 
 post-stop script
     # don't stop in containers
-    systemd-detect-virt --quiet --container && exit 0 || true
+    /bin/running-in-container && exit 0
 
     if [ "`dd if=/proc/sys/kernel/core_pattern count=1 bs=1 2>/dev/null`" != "|" ]
     then
diff -Nru lxc-android-config-0.230+16.04.20151112/etc/init/avahi-daemon.override lxc-android-config-0.230+16.04.20160328/etc/init/avahi-daemon.override
--- lxc-android-config-0.230+16.04.20151112/etc/init/avahi-daemon.override	1970-01-01 00:00:00.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/etc/init/avahi-daemon.override	2016-03-28 20:50:41.000000000 +0000
@@ -0,0 +1,4 @@
+# avahi-daemon - mDNS/DNS-SD daemon
+# overrides for touch
+# do not start avahi-daemon on boot
+manual
diff -Nru lxc-android-config-0.230+16.04.20151112/etc/init/cups-browsed.override lxc-android-config-0.230+16.04.20160328/etc/init/cups-browsed.override
--- lxc-android-config-0.230+16.04.20151112/etc/init/cups-browsed.override	1970-01-01 00:00:00.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/etc/init/cups-browsed.override	2016-03-28 20:50:41.000000000 +0000
@@ -0,0 +1,9 @@
+# cups-browsed - Bonjour remote printer browsing daemon
+# overrides for touch
+# do not start cups-browsed on boot
+manual
+# do not respawn when cups-browsed shuts down by itself
+normal exit 0
+# start cups-browsed in auto-shutdown mode, creating queues for native IPP
+# network printers, and using IPv4 IPs to reference remote printers
+exec /usr/sbin/cups-browsed --autoshutdown=avahi -o IPBasedDeviceURIs=IPv4 -o CreateIPPPrinterQueues=Yes
diff -Nru lxc-android-config-0.230+16.04.20151112/etc/init/cups.override lxc-android-config-0.230+16.04.20160328/etc/init/cups.override
--- lxc-android-config-0.230+16.04.20151112/etc/init/cups.override	2015-11-12 12:52:10.000000000 +0000
+++ lxc-android-config-0.230+16.04.20160328/etc/init/cups.override	2016-03-28 20:50:41.000000000 +0000
@@ -1,4 +1,8 @@
 # cups - CUPS Printing spooler and server
-# socket activation overrides for touch
+# overrides for touch
+# socket activation
 start on socket PROTO=inet PORT=631 ADDR=127.0.0.1
-exec /usr/sbin/cupsd -f -x 30
+# do not respawn when cupsd shuts down by itself
+normal exit 0
+# start cupsd in auto-shutdown mode
+exec /usr/sbin/cupsd -f -l