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

Change-Id: I2616a3ca94f30bac471f7d99b4503ac9bb8c577f