Merge "ContentValues: improve documentation" into nyc-dev