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

Change-Id: I1687f90ae7d042db2575ca10b168833e27adc7cb