am dcbf64a3: (-s ours) am f0802910: Make TimeZone select logic aware of DPAD event. Do not merge

Merge commit 'dcbf64a3c6e0d87449b4f28d3388a72f4c8ddf60'

* commit 'dcbf64a3c6e0d87449b4f28d3388a72f4c8ddf60':
  Make TimeZone select logic aware of DPAD event. Do not merge