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