Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev