Cleanup: Fix entries for wifi and BT am: db0eda3
am: c11cc12

* commit 'c11cc128039b873132da6e718528483dcc456ce2':
  Cleanup: Fix entries for wifi and BT

Change-Id: I37176650a188ceace05128046b69796dd13ae8a3