Merge \\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours
am: 3593c2fa62

Change-Id: I602665fc0786a47555fb2a2b8d36d0d2127a70e7