am 008a0a5d: am 53493a9b: Merge "Sort NOTICE entries."

* commit '008a0a5d50965f73d5954607a0b17b95a7f1fd0e':
  Sort NOTICE entries.