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

Change-Id: Iaf2e474c23eb7691906efcf3a1f2be3bc1ae9183