Merge "Fix "null" in content description" into nyc-mr1-dev