Update manual installation steps and TODO

Change-Id: I595d875ded0e39fee14ed9c506fe7162ad2105f7