Merge "Keeping notifications around that show guts" into oc-dr1-dev
am: ea2cbdecca

Change-Id: Ie9e2152a7aadf1f9b3cd42aa6a3791cb62ab34bc