Sync RelWithDebInfo patch with 3.3.0

Change-Id: I51a34c4efdefc795156055c28aae0406b57eb51a
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>