Amends 29fceed2ff Pick-to: 5.15 6.2 6.3 Change-Id: Ief3317a89f7be1dd1dc249297bd16e958b9e1ef2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
29fceed2ff