am 1dc8c62c: Merge change 8563 into donut

Merge commit '1dc8c62c5078f1598cc906de1b97b572cc3449a3'

* commit '1dc8c62c5078f1598cc906de1b97b572cc3449a3':
  AI 150506: Fix some date format problems by switching cupcake over to using