Merge "Change the time format to short" into pi-dev am: 9bd77dea82
am: e17fed3408

Change-Id: If517794479e4f3ace6f25a5e5c8ef117890efa33