Merge "Fix BuildVersionTest" into gingerbread