Commit51727428fcadded a string format which caused an exception. On top of the fixes to this from5a45327352, we can also fix a few more issues here with some missing arguments to other String.format invocations in the aforementioned CL, and other formatting problems. Bug: 33737715 Test: Build and run SUW (cherry picked from commite46b47d85d) Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36