revise two function definitions with less parameters Change-Id: Ia96e5bf915e4d3c0ac9c1795114bd9e5dd07327a