Adapt to Jill api changes

(cherry picked from commit 7e6f5b5a5f341e747cfdff4f7b2ee825d3234a6c)

Change-Id: I38799236ade9d932653c98b702d87365e433d6d6
1 file changed