Cherry-pick changelog from 0.2.5

Change-Id: Ibbafbd4ac9df85894f0a71bbcf9baee02835e282