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

Change-Id: Idf60c16ac8003503f33130ddc6276a17fed75108