this part anyway, the sc/qa/unoapi parts are
still broken

Change-Id: I759c4f82b3bbd4da4dc7d0c9e16aacee02972f51