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

Change-Id: I6d36a76e238e139452917cb861eff22d85f86e25