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

Change-Id: I5c20e88a79cd3eab981dbfd339f132e42c4dc46c