b/3188954 & b/3188992 Fixes uses of home tz

Change-Id: Ife639ea40b327c50648b693dce4d5fdb9c70186a
2 files changed