Merge "Make time zone data app code unbundleable" into oc-mr1-dev
am: 27412bf7d7

Change-Id: I53cfd121b037fd4fb9bc7ff04f543d1a5ae4d244