Merge changes from topics "timezone-2018h-i-fix-morocco", "timezone-2018h-i-straight-patch" am: 15208a3e am: 1a9aac56 Change-Id: Ide706b319b5f41318a772b6ac627914a619e5727