Merge changes from topic "tz_catchup1" am: 4e0a02ce1f
am: 60bc26e3e2

Change-Id: Id72c4cb572051e3898d2f432918feb0875b104c3