Merge "Defend against an unexpected null bundle that causes blockingGetAuthToken() to throw an NPE."