am 8171f415: am a2479606: am e62febda: am 7865c6f0: am e35ae88b: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev

* commit '8171f415351b2b891bd1c6e8fedad6f31f1ffb72':