Merge "Follow installd API changes."