Merge "Stop creating sdk data directories due to boot time regression" into tm-dev