Merge "Update BuildVersionTest for ICS MR1" into ics-mr1