Merge "Must synchronize for ...Locked() code paths" into qt-dev
am: 5f5020d42e

Change-Id: I8e0422d6858b734cab89e8721654ac0a441f201b