Merge changes from topic "tz_format_version_4" am: 0680256d7f
am: 6001c54403

Change-Id: If3a820805259327f562fb15c87e05036f75554c0