Merge "Implement LOCAL_TEST_DATA to ship data with tests" am: dd0e69d47f
am: 04cf52edab

Change-Id: I49c20d55c5fd7af70b536b530d3a747e788e3931