garciadeblas authored Jul 05, 2020 and Mark Beierl committed Aug 27, 2020

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