patches for serranods

Change-Id: Ibae50f07784e7c38cf56bf5693236a973765f79e
Signed-off-by: k2wl <k2wl@github.com>