Make 'quotation-marks' message non-optional (again)

Follow-up to Iaf9e42ed. See I9282c787 for reasoning.

Change-Id: I43078741b9fd7a8a1f59bbc6b757682db9c3b48e
Merge "Make 'quotation-marks' message non-optional (again)"