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
am: b69dccf1 -s ours
Change-Id: If0a6f561fde5470f826e01713f8ed778d86b309c