Merge "Merge "Time zone update API classes" am: cfe0c2f1ec am: 463f3f8cf7" into nyc-mr2-dev-plus-aosp
am: 5b14a2f0b5

Change-Id: I614964f97c141532560932955fecb5bcd61eb075