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

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