Merge "[BUG] java.util.MissingFormatArgumentException: Format specifier '%d'" am: 02309e9748 am: 6a2fcae638
am: a900930d58

Change-Id: I180c73a8dc41ea907c1e7fd76624fce0a4b523d3