Port S3 utils tests

Change-Id: I392e03f91a3809cdfe029c9a26969ecd74615ed6
Merge "Port S3 utils tests"