am b643ef78: am 266045e9: b/2224837 Clean up Alerts/Notifications

Merge commit 'b643ef788ad4db766e983e3f265827e6ae2f69fc'

* commit 'b643ef788ad4db766e983e3f265827e6ae2f69fc':
  b/2224837 Clean up Alerts/Notifications