This reverts commit 4bdfcc990b This change was causing some deadlock problems. bug: 7144860 bug: 7132419 Change-Id: I6a45459b0be024c8c36ccca3b2e2d304ddd94ee9
4bdfcc990b