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

Change-Id: Idc37e61f9b56e491464769852ae9bc74e91b1a8e