Fix RWK paragraph handling

Change-Id: Ibbc9548b023c86f4a7a435900f32444a74187e5a
13 files changed