Merge "Use correct open/close content description strings." into klp-dev