Do a few TODOs for S4 support

Change-Id: Idbdcb0618f039ee6dbdebe5723a54d2bb4e2135e