Merge changes I7f697d1d,I60f47a48

* changes:
  Remove parse_radio_log
  Remove some obsolete TODOs