Merge changes from topics "timezone-2018h-i-fix-morocco", "timezone-2018h-i-straight-patch"
am: 15208a3ed7

Change-Id: I7ec8d5fe5b8c7633579734979727650439337056