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