Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2