Merge "Fix BuildVersionTest" into honeycomb-mr2