am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev

* commit '220fa85eac119fa51b1febbc4361afb4531f949b':
  Finish annotating Notification.extras.