Merge "Allow callers to synchronously block for shutdown" am: 9121322ce7
am: a49db4d080

Change-Id: Icd7df06784a0ecf14c8b9b35d579179ffce65ffc