Merge "[AChoreographer] Resolves a deadlock" into rvc-dev am: a821321b90

Change-Id: I36bd39c1e98a5c485b96e542435985854d9617c8