This reverts commit d56eaf68. Reason for revert: Causing a sysui crash Bug: 157756391 Change-Id: I9df1bf4a3e9e6cb2f03218ba3c56c7c5660483c7