This reverts commit 02626f93. Reason for revert: revert together with aosp/2133802 Change-Id: I795c15d8cd69764dca8e69b285eb8c3e00935b44