Merge "Use waitForIdle() to wait for Threaded processing." am: cd768aecd8

Change-Id: Ida71ad5d045f87dd11877dc93d42885333bba336