Merge "Add a manual path for setting time zone" am: 7fcab2dba8 am: 57aaf1d427

Change-Id: I8a7113adfe3d420be6e3a99fb504859fc2f387ed