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

Change-Id: I85ed2e7f1fd45f0ebd37948694f32b6228d3df42