Merge "Add "fixups" for ids referenced in code" am: f13f84fd9f am: 2ccb5bfecb
am: fccfede79f

Change-Id: I2a984f15d43c2f5df2376730b515e4da8dc82a1a