am 87a13283: Merge "fix incorrection assumption due to DST" into lollipop-cts-dev

* commit '87a13283cb7290e623d9fea20b5bda5487e715a4':
  fix incorrection assumption due to DST