Fix ping issue at LF

Change-Id: Ibf2ddc896fb67e02dcf867bab79d2a16ffe4bd43
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
(cherry picked from commit 7ea54df1ad6c7ae0c0f620dd0e932677d2c3dcce)

Change-Id: I2505087acd32fe0a3f9678ab49e59f3dee719b6d
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>