Merge changes from topic "tz_catchup1"
am: 4e0a02ce1f

Change-Id: I629930379afd2e3037bbd460ebc83726a8bb0008