Merge branch 'stable-3.3' into stable-3.4 * stable-3.3: Fix 'illegal format conversion' compilation error Change-Id: I50d8ff92d31caf039391847a076ca71adee3083a