Merge "Use new GsiInstallParams struct" am: 7898d33e3a am: 6b1e8cc0ab am: 630b0caad1
am: f5b0ba4072

Change-Id: I1c7b89d1c076473064acd743df12cc9dc0976e8a