Merge "Use LOCAL_TEST_DATA for test data"
am: ad2b30810a

Change-Id: I35911b438b2f5e4becef60eae5dcee789e93988f