am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"

* commit '2ff6a3bbdf3a086e5e9a89e9acc66e8c5ae00539':
  Add explicit dependency on tzdata_updates_intermediates for CTS