Merge "Follow installd changes, throw exceptions."