Change-Id: Icb0f21d09d803c7fb031816423438e3276ce7b18 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>