Make id explicit, but also allow it to be unset

Change-Id: I2d3b41734998f9146c83cc49d738f8e23cad1883