romeromonser authored Dec 10, 2019 and Mark Beierl committed May 26, 2020

Change-Id: I7534cf2ae0ef60729634e31da8af390e14e9d730
Signed-off-by: romeromonser <garomero@indra.es>
(cherry picked from commit 5bed3ad4)