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

Change-Id: Ic0293bf12688e785f4942f0985a8470155fe062b