Merge "Revert "Make verifier device id information visible"" into jb-dev