Merge "Some tests are run from /data/local/tmp, and they need proper namespaces." am: 31fd0ba559 am: fc2c45cc62
am: 555ce45093

Change-Id: If075bf2245ac07c3848f169f02536df9a57b1ade