Merge "incident report args: add setter stubs & constant aliases"
am: cdcd19f560

Change-Id: I6edc89437a161a191e5ea1bd775fbbc9c0fcc59b