[DROID] Fix TZ after bfc296b