Reason for revert: Still needed for <4.14 devices. This reverts commit 0e87a83c. Change-Id: I025911c9cb033d8021e6f23c005ce546411b1472