Merge branch 'master' into v7.0 00/8500/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:43:16 +0000 (21:43 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 20 Jan 2020 21:43:16 +0000 (21:43 +0000)
Change-Id: I7d20be8d36a8bd4f58859f6e34638738c913373f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge