Revert "Added fix for local calling codes (removed import of Log)"

This reverts commit 71c27d82b7bb9c10e1065e6f131da7d4e43b9552.
Revert "Added fix for local calling codes:"

This reverts commit dffcdbeade10af5b238c35d068df69c29dd18f8e.