Add comments about possible lock contention am: b871d3eba8

Change-Id: I703b3ef81202ebfcf9bb154b7ca6b6dccaf03120