am 54d2a1f6: am 69bb2e8b: Merge "remove a read lock to work around a platform...
am 54d2a1f6: am 69bb2e8b: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
* commit '54d2a1f6':
remove a read lock to work around a platform deadlock problem.