Merge "Using zen duration preference" into pi-dev am: 75431913ef
am: 32cd38c699

Change-Id: I6419ffd80c8af484d77029cfe2bb43b69a5aacc6