This reverts commit 123fba9f. Reason for revert: Fix build error (ag/11388833) Bug: 124531214 Change-Id: If4810b59ba0665b7fec1329982800674297d891c