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