Merge "Update BuildVersionTest" into honeycomb