Merge 'origin/master' into v5.0 70/7170/1 v5.0.3
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 14:10:03 +0000 (15:10 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 1 Feb 2019 14:10:03 +0000 (15:10 +0100)
Change-Id: Ic95c9efe0f67db8b3659c71ad88c42c33ae93015


Trivial merge