am 58d08711: am 7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."

* commit '58d08711af5e8237d6196652d59cc4e8b8caafcf':
  Update generate-NOTICE.py to know about tzdata.