Merge "Enforce configureRpcThreadpool before join."
am: 9577c1252e

Change-Id: Ia98c7c084a932e0844f5ce937aa20054cf9a9a68