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

Change-Id: I4822d26b1cf5667ae67131422d8f41da6b2ad28b