Merge changes from topic "handle-odr" am: cb436ee566
am: ee4e6ed82e

Change-Id: I413863c86b481ca1c04537d5b913c9c86c226028