Pass args

Change-Id: If9a1208758b650c44293b936dfb27b96a851621f