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

Change-Id: Iffcab624a957d30c02a0dc766495b76280a7a2db