Revert "find7a: a few fixes from oppo-source"

This reverts commit 89ac0944aadcd76f02b4d105c6f5abc7c19a2d7b.