Literal $ characters in the template which are not part of a substitution variable should be doubled to to avoid raising a ValueError exception. Change-Id: I14fd33571d63d50fc65e8c87fb10577e691b6c8e
This is done as a separate step from the content formatting change for ease of review. Change-Id: I50111f5bedba2ce4e3793d5071d10567fa71e3b6