Fix ChangeLogs

Change-Id: I32d871b52809fb1224cfe6070ab0a3ac1a782550