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

Change-Id: I5295f6e63ac9aafbebaa9870776e0502bf5129d7