Add option to disable CRT off completely (2/2)

Change-Id: Ibe05356789e033a40581260b19792054a10df5ae