Merge "Adds time zone functionality into fw as a hidden api" into gingerbread