Try to use names from time zone strings if all else fails...

Change-Id: Ie417a6b27c731f24f0d8ccf5275df9c2fad37efd
2 files changed