Merge "Fix lock order issue with large-object space lock"
am: 6b8a38ce03

Change-Id: I64035710b05db17fbd573ff6d6cb805669ba5fc7