These changes are not applicable for aosp and will be implemented in master. This reverts commit 9f47a5d8. Bug: 31003437