2c99c990d3
This reverts commit 9bd666007d. Reason for revert: build break b/297170337 Change-Id: I2459b680bb3153d3d7e0f17761b4a825da942bcc
9bd666007d