This time noticed by the linker when doing link-time code generation (!).

Change-Id: I9600571bef2a8cc30b2e28dd52b01633bab55f32