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

Change-Id: I252b79028d723ceff1d552c5758c969a6b68b7c3