am f057524d: am b02b8369: Merge "Remove a workaround for the data...
am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'f057524d':
Remove a workaround for the data inconsistency of SystemProperties