Fixed GRAIL to work with the latest Ferma API changes.

Change-Id: Id5a66c68563c65d03264effd3f5a7284f338b674