Merge "Update BuildVersionTest to support 4.2.2" into jb-mr1.1-dev