This reverts commit c1e4316e02.
Reason for revert: Now the circular dependency problem is resolved, this change is now obsolete.
Bug: 123336670
Change-Id: I065d811e9b8a3c7f851fb66d9527d62b417f1420
This reverts commit c1e4316e02.
Reason for revert: Now the circular dependency problem is resolved, this change is now obsolete.
Bug: 123336670
Change-Id: I065d811e9b8a3c7f851fb66d9527d62b417f1420