Tidy of spurious TODOs.
Merge branch 'apks' of github.com:mykmelez/gecko-dev into apks