am 0b866177: Merge "Use correct open/close content description strings." into klp-dev

* commit '0b866177778e2b3a07ef29a080e132c85b0ac2c5':
  Use correct open/close content description strings.