Normalize JSON in preSaveTransform

Change-Id: I5bfa4a26a50b893afa26681bd501ff560a3e94e8