Merge "Update dagger types."
am: 9337f657f6

Change-Id: I18b77316be05fdba5285cd24ff74ffd0d795b89c