Start geting Toroplus ready for Nightly Builds

Change-Id: I0977fd1df51850d757fa890645e612b34f3007c1