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

Change-Id: I398b9b48447835bc86816187ed5bab4233dcf6e1