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

Change-Id: Ib74148ab149d4158b985c7813542b63e8e6c61f4