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

Change-Id: I278ad860ceccb2a1ae258b36ada9c3ba4806dc67