Merge change If338e940 into eclair-mr2

* changes:
  Introduce ContentValuesBuilder and make tests easier to read.