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

Change-Id: Ic6d8ff403f54e54d9b353f67f76851bd46b0aff6