Merge "Fix missing zone strings in some cases" am: 26f3511f97

Change-Id: I0e9b60036a11ff4fc24fcd32490b5a403b8f8f03