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