Android patch: Deduplicate data finding code in tests. am: 13dcaac624
am: 3154bed797

Change-Id: I2229e051b0b91b69f7b9509e33f212c97c7d970a