Merge "Use LOCAL_TEST_DATA for test data" am: ad2b30810a
am: b1a2bd97b3

Change-Id: I6af0e1f0d5ea6697605fc946354da8f92d9f4d39