Merge "Simplify __attribute__((__printf__)) use." am: 2aa50ff56d
am: 1f40b2c171

Change-Id: If4ed8fae3a627017d87759a182704c7e49630a81