Merge "Add an additional test for ODR."
am: 2cfca9462e

Change-Id: Ief0d9649ae3022b45a0328f32608cdcf9040a840