Merge changes from topic "am-611eed0754b144ed92d14b3e518d54f2" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba1663 -s ours am: 18d5ebc3 -s ours am: 283bea4d -s ours
  [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249 -s ours am: 27c242f0 -s ours am: 92c94ed6 -s ours