Merge "init: Add more diagnostics for b/223076262." into tm-dev