Revert "Revert "use 538 for Find7""

This reverts commit 5a23ea40b85e165e42f1c21adf0f57f9c0f38850.

Change-Id: I67f021ac946edee2c046eab95a3527970adbd43f