Merge "DO NOT MERGE: push out fix for data dir." into marshmallow-cts-dev