Merge /data/l/clean-cg into v3.20-n900

Pull 3.20-rc0 changes.