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

Change-Id: I5a84244ea8b70c57bf0a74b03d125f42994f5b5b