split find7a and find7s

Change-Id: I66ab0f5813bf688c8de760d4498be3548ded805b