Use shortFormat instead of shortFormat4.

Won't make a difference since shortFormat4 is simply shortFormat
with the 'y' characters doubled.

bug: 18388178
Change-Id: I6177807430b295035092367553da5de3b942e2d6
Merge "Use shortFormat instead of shortFormat4."