am 53493a9b: Merge "Sort NOTICE entries."

* commit '53493a9b26e9fb665de590abf3502af94eaf3f44':
  Sort NOTICE entries.