Merge "Handle JavaBBinderHolder not init w/ mockito"