find 5 support

Change-Id: I8a025cf0c1db6511c79ca3ab816f3b8e676190e9