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

Change-Id: I91ec4a4cbfc2fbb3e84c3f1c6baa007ef77af936