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

Change-Id: Ie4afe19fe05d760ce22246fb98ef9f5a8a8a88d2