Merge "Fix installd dump"