This reverts commit 8069d3856d. Reason for revert: black display in AoD Bug: 182851537 Change-Id: Idc0ef7cf076b6060cc76c983bd512247f9e8a4c0
8069d3856d