Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev