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