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

* commit 'f057524db620c490e96fa886238f3b31bd973060':
  Remove a workaround for the data inconsistency of SystemProperties