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

Change-Id: Ic2d64b1bd8482b2636e9f2695eebd25d32e1782b