Merge "AOD: Do not show guts nor snooze" into oc-dev am: 96da371a6d
am: a4f06716da

Change-Id: Id57b55adf501c3c58c36ae9e4bf2c119e7a137cd