Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix log statement formatting Change-Id: I57cee891b7610fdaf7ef37b2fe1cf11b3010157a