Updating changelog for changes from master

Change-Id: I3a711df0afaa1e5bfc42442a7f497658254f4d41