Fix the find tests. am: 86537b33a0 am: 5917b9eca4 am: 8deae91cfc
am: 6b613cb26e

Change-Id: I1253e7837774f8854d55b7c9ee46c73a7b0dbd95