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