Merge changes from topic "bt_get_cod" am: 35dc02004c
am: 178e5873b0

Change-Id: I3fef3c3a196af47518affea2ecac04ccadf4de4e