am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev

* commit '4b6d23d7b45f813bee52747b3243ce46ff9edbd0':
  Further reduce memory usage of notification archive.