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

* commit 'f094d221e53e2359f886ae3d601c490ade70443e':
  Finish annotating Notification.extras.