Merge "Workaround bad markdown parser." am: 84235b7137
am: 19e4c9e245

Change-Id: I0307fb6d917f07c9ec8c5eb05b563a3e557692b4