Merge changes from topic "presubmit-am-eb3bf0d06a7a49bb8bd42e501bd39d7c"
* changes:
[automerge] Stop creating sdk data directories due to boot time regression 2p: 7f732f19 2p: e2ce4820
[automerge] Stop creating sdk data directories due to boot time regression 2p: 7f732f19