[automerger skipped] Merge "Only setup data when config and sim is ready" am:...
[automerger skipped] Merge "Only setup data when config and sim is ready" am: 5a960eca am: a716212f -s ours
am skip reason: Change-Id Ic05114121a89d87e9f4957dac2d90cd3a06aa3dc with SHA-1 9efd060b is in history
Change-Id: I009cffd8b4708c0b71e7ad72afd70513454e1f20