Merge "Track move of distro installer code"
am: da1654aef0

Change-Id: Iab784583f531d6548ca1ba7225a8b2cdcf7c2e69