Merge "Fix cts-content testdef." into eclair