Updating references of extra time-zone am: d5e2ec732d am: 6605341063

Change-Id: Ib2817b2882dc0588e6fa3f196e73d230577cccdc