am 7ed00b55: am ca1b86be: am 7993e430: Merge "Fix wrong timezone for Chihuahua" into lmp-dev

* commit '7ed00b55a041ec17d872dd67cc2e159479fc12ad':