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

Change-Id: I4b4973570b8a8f1757986b1aa8ee1a6c3496d976