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