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

Change-Id: I8ecd74701db7e935cf20fb853e60d49594caf510