Version and Changelog Changes

Change-Id: Iaad5f3e0fe511cca569d577cd1760e6b88758b45