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

Change-Id: I9aea00c77f69134dedde0f77c277a0eed815a125