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

Change-Id: I6dbd5e99ab67ffe5f086bb7c310473da6527f93a