Merge \"DO NOT MERGE: push out fix for data dir.\" into marshmallow-cts-dev
am: f09a2ff2e6  -s ours

Change-Id: Icdb05b897a4877b86581b41d1dd7d1a14031172b