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