Merge "Fix cyclic-dependency between oss services"