Merge "Fix potential divide by zero in display_html" am: 524311b26d
am: 41e721028a

Change-Id: Iac24401f1c8370f80824b56d63dffebd36081f13