Merge "Fixed a leak with TransformStates" into pi-dev am: 650d79e7af
am: f73e79ba30

Change-Id: Ifb899656faf6b8f2c64a6c67a5ab14094cc6fdf3