c864281f3c
Revert submission 31490053-DisplayControllRefactorForCD Reason for revert: Leak is displayProvider Reverted changes: /q/submissionid:31490053-DisplayControllRefactorForCD Change-Id: Ib65150cdde765be009b5c4ce960f9fe025de9e60