This reverts commit 9cbb4fa4e7.
Reason for revert: this change might cause NPE on Settings app.
Change-Id: I4fd5ec36941c7516a25eaff6d64bcf62e0de7b39
This reverts commit 9cbb4fa4e7.
Reason for revert: this change might cause NPE on Settings app.
Change-Id: I4fd5ec36941c7516a25eaff6d64bcf62e0de7b39