Merge "Fix ODR violation"
am: ebfd2a468b

Change-Id: Id3af3d8d9c6e5b42a1ef4712171a486d9c81c8aa