Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp * commit '0c3154d3fc54a1b3d8358a2932042cca729327b9': Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp * commit '0c3154d3fc54a1b3d8358a2932042cca729327b9': Fix issue #2163654: deadlock, runtime restart