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

Change-Id: I6d7a02e1ab7e1b23bfd8ee939003e3cb9b16ed53