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

Change-Id: I7c0e6cc298165d1dc5e25014d73e850b9f7fe201