threadLoop merge

Change-Id: Id8e6330ac6be76f9c2debba94f856de87e2d98f7
2 files changed