Avoid cross lock acquisition leading to deadlocks

Test: manual

bug:36007738

Change-Id: I3db09af07857435682754916849433a809547974
1 file changed