Minor qadevOOo improvement

Change-Id: Ibeefc8e9aad57c28722b62610231d14ebc8a7403