Merge "Track move of distro installer code"
am: 8558d93db8

Change-Id: I2d27a58c21b7b8931b1d058d6a6bc88eeb8f7709