This reverts commit 8d60c5ceb4.
Reason for revert: <this CL doesn't break error prone build. Will redo the CTS one which does break the build>
Change-Id: I5899acf02006a164e31f9b82aeaa7974dd6d2869
Bug: 182869926
This reverts commit 8d60c5ceb4.
Reason for revert: <this CL doesn't break error prone build. Will redo the CTS one which does break the build>
Change-Id: I5899acf02006a164e31f9b82aeaa7974dd6d2869
Bug: 182869926