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

Change-Id: I3a27d3a1753a4e1f11b5dd0668dfd6a1e410e72b