Merge \"Fix stale transformations\" into nyc-dev
am: ea16efd52c

Change-Id: I14088360a948f5e4ef94c5171a2a603b75bbf0e9