Merge "net: Changes to support Shortcut Forward Engine"