am 12f3e97c: am e97e78a0: Make unittests work, new TagBroadcastReceiver

Merge commit '12f3e97c7a011cab7b13caeff308da380a62f6b8'

* commit '12f3e97c7a011cab7b13caeff308da380a62f6b8':
  Make unittests work, new TagBroadcastReceiver