This reverts commit 48fed61d. Reason for revert: m checkbuild failing Bug: 77907164 Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48