Merge "Use the right flag types when creating InstallArgs" into jb-dev