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