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

Change-Id: I651b8987cc3f3cc0cca263c8c6b73c43a61fdd57