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

* commit '322480a097a098ac39dd148e8aecc1106d5a3a88':
  remove a read lock to work around a platform deadlock problem.