This reverts commit 14ca142e65.
Reason for revert: Now the circular dependency problem is resolved, the change is now obsolete.
Bug: 123495968
Change-Id: I5992f9dd205654ce70143773f9ab9bdcafee9ace
This reverts commit 14ca142e65.
Reason for revert: Now the circular dependency problem is resolved, the change is now obsolete.
Bug: 123495968
Change-Id: I5992f9dd205654ce70143773f9ab9bdcafee9ace