Fix the find tests.
am: 86537b33a0

Change-Id: I529dfdee828b926aee22871944aea2c7e5bfa8cc