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

Change-Id: Ide4ac15f2b27cda8041374848ea1a0357c9161b5