Merge "Update BuildVersionTest" into gingerbread