Merge "Fix date on devices in setup-buildbot-device.sh."
am: 3a791cee90

Change-Id: Ic58fc08944cfa7547672f655efffff842035aedb