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