Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
am: 001956c626

Change-Id: Ic1c65063fce8cea01b01569cba6181f4465cd88e