MY BAD... again. kdiff can't handle block comments for s0@

Change-Id: Iedf5389d84382b382de09d111ae4ff1dde51c5be