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

* commit '0a8ed3f214ad9d4cd173cbffe6e712c395a108f6':
  Further reduce memory usage of notification archive.