Run stop b2g and start b2g with 'adb root' privs
Set user-selected timezone in setUp to override the nitz setting
Update test_calendar_today_date with simplified date
Merge remote-tracking branch 'upstream/v1-train' into v1-train