[automerger skipped] Merge "Fix missing zone strings in some cases" into rvc-dev am: 4f244f6b88
-s ours am: 53f3cdbba4
-s ours am: 18f9fdc976
-s ours
am skip reason: Change-Id Ia89c777a832f8b41c8d56d3327a9b7370ba44b52 with SHA-1 eafec7a244
is in history
Change-Id: I49da940d993b2e909b9ba6c292b2115d6633498d
This commit is contained in: