Add TW System Select

Change-Id: I71719fa6fa5fd3901404fe905be4eeebd26b56d6