garciadeblas authored Jul 08, 2020 and Mark Beierl committed Aug 26, 2020

Change-Id: I6b5b314949d9775b6e71312d97dc293a49385945
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
(cherry picked from commit f7d00303)