Simplify kernel calling ... fix flow build

Change-Id: I19ccb645f43a02b0c0504998c1e067f5051e563d