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

Change-Id: Ied52736d9d0f07fc0263dc10ec3e0b999f4ccebc