Merge "Apex, Functest: Enable smoke tests on Apex master verify"