FIX Auto time and time zones

FIX AUTO_TIME and AUTO_TIME_ZONE moved to Global google
Change-Id: I6a76e6fed0210d7dee21b17c94294b6cea9c28cc