updated from stock rom, may revert
Revert "updated from stock rom, may revert"

This reverts commit acee664ab6b00a7711b6f648117d7cbcf7f1535b.
Revert "Revert "updated from stock rom, may revert""

This reverts commit 85aad0debaee7b072283b76676a9a918ae0980b4.
Revert "Revert "Revert "updated from stock rom, may revert"""

This reverts commit a8c3612d288f3ce7e3d99e0a639176d410b520d4.