Merge "Wait for threads to finish before returning." into oc-dev
am: aedcedfa85

Change-Id: I750feebd454a841877b26771c40d2979f47299ba