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

Change-Id: I5314c4fbd25aa1f6b223c2aa56a9724730a5123d