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

Change-Id: Ic50e017f72e520da141580227648a7e639cc8cea