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

Change-Id: I995823bc7985da570b13d8d7b8c7b5d1f555d3b2