am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread

Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'

* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
  Adds time zone functionality into fw as a hidden api