Merge "Add content description to zenmode" into pi-dev
am: adc1534453

Change-Id: I5cd398157fb641b88145a0f90766161e5b8124f0