am f43652de: am 025c8ec1: Merge "remove a read lock to work around a platform...
am f43652de: am 025c8ec1: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev
* commit 'f43652de':
remove a read lock to work around a platform deadlock problem.