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

Change-Id: Iaab4c72c1bfa4953178b766bc210072c89ed9c6e