Change-Id: I3a82423378d3198a25f90ddfbf42af55d85c96fb
(cherry picked from commit 668408fa, w/o the
accidentally included sw/htmlexport-swobjects.patch)