Merge "Fixed incorrect time zone when the device is on IWLAN" am: 5f7d47c2...
Merge "Fixed incorrect time zone when the device is on IWLAN" am: 5f7d47c2 am: 03ba9e23 am: 620d608f -s ours
am: e163e91c -s ours
Change-Id: Iaf312ccfd26d1cf1660d580ef173f2b28b646757