2.5.2 release

Change-Id: I64cc20292018d7373dceb816b068a4e78c87495e