tree cdcf0e49fc202941389286f36607c63a903c5d16
parent b66b213f00783ed296180e8fd5bd6fcd661eac3a
author Alexander <athom@google.com> 1524076300 +0200
committer Alexander <athom@google.com> 1524076300 +0200

[release] Merge changelog from dev branch into master

Change-Id: Ib30ca03e2068ebe05a7f00902afcfe62c7ebbc4f