Merge changes from topic 'partial_tlab'
am: 4c408ca726

Change-Id: I7af86c0bedb0f3c4babd8bba3bd46acf8225d63f