MOXy update

Change-Id: Icb9f7e65f7c262610826396c3ddbccaba3a73077