Track move of distro installer code am: 77a2eb768c am: 2946ad6d2f
am: e4b16773f0

Change-Id: Ia9c78befac067614a90e176359d36d8a8e941edf