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