Merge forward deadlock fixes from release/0.10

Change-Id: I67a6f3093d685e2bb9fe9c6036d255d506560324
10 files changed