Merge "Make caller wait for installd to become available." into tm-dev