Merge "Default 'persist.sys.timezone' property to GMT if not set on init." am: 302b7a7075
am: 2f5a9febf4

Change-Id: I43c05ca3f139fce4e08c7c40cc3823821341d176