Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread