Merge changes from topic 'partial_tlab' am: 4c408ca726 am: db1ee01c9b am: d15ec3f8dc
am: 235a1b5908

Change-Id: I275b819f877ac67aa3f3ea782b7ec7818ffb115b