Merge "remove a read lock to work around a platform deadlock problem." into klp-dev