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

Change-Id: I1d648dd7d700230afab893336ef853a41717ba80