am adcc1f20: am 855223fa: Merge "Fix ambiguous phrasing in tests comments regarding $."

* commit 'adcc1f20fe01134301b13769b9595fd78e4ffc35':
  Fix ambiguous phrasing in tests comments regarding $opt$.