Merge commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99' * commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99': Introduce ContentValuesBuilder and make tests easier to read.
Merge commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99' * commit '7113f59de3ccf8ba5a48273e8e6b7b8138a31f99': Introduce ContentValuesBuilder and make tests easier to read.