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