Merge "CE: Reduce scope of where -Wconversion is disabled"