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

Change-Id: I854163e35e826f52cc908327b1f5650cf8264ef5