This reverts commit d759b3517a. Reason for revert: b/289779264 Change-Id: If7bdba6a420f2a310ad86b7b3b44eba5111c5d69
d759b3517a