Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1