jf: not to be judged by its unified tree name

Change-Id: Id910eff266481cbc4f76e851a83ea4cf15f2ef6a