Revert "Revert "use 538 for Find7""

This reverts commit 802987d827beff5cd9a4857ea1f40f10f31b3b91.

Change-Id: Ib2be2dbf5c6e42278155f22520a5e78c5ae82278