Merge changes from topic "tz_format_version_4"
am: 0680256d7f

Change-Id: I73cac7c13ca75d7645c10ff36f78196592baf7c5