Allow unverified on Android (bug 924985)

Do not merge, this has a couple moving parts