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

Change-Id: I66ffeeae10c6c6deb408a20a5bb5ad86e3bcf97d