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

Change-Id: Id8856049a5e805a7eec4539b434643d445defa74