[automerger skipped] Fix compilation error for printf args. am: c206315b2f  -s ours
am: eaad5f3289  -s ours

Change-Id: I17cb1e87c3c902abe1b9d0b9dd5caeccbc331d23