Add more TW_SP*_PARTITION support

Change-Id: I6557949cfbb4084ff6399876f84923ec5f4c33a1