Merge "Fix deadlock in cuttlefish/default implementation" into rvc-dev am: d183abf853

Change-Id: I4888bb5f4fbac25efd6aa730d2aec2dedc6bf260