Change-Id: I4481879366f136370f4bd549bb2ef2f8764cf821 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>