Merge "Merge "Add stats to notice UI." am: 1db210c09c am: e8764668de am: 332a00ecab am: 1a4f3fa6fe am: e9793644ac"