Merge commit '26a0e5c892746df093f74038647897d47e1cd341' of sso://googleplex-android/platform/packages/apps/HTMLViewer into HEAD
Change-Id: Idc6b0b145a77fec0ef80268a7522b26ae38c04b7