f62: Adapt for leaf

Change-Id: Ica98956ca11ea4d9fe8a29d0d9c720e2b61c0e26
3 files changed