Merge "ContentValues: improve documentation"