This reverts commit 75e1da7beb.
Reason for revert: Caused build breakage - b/10429173
Change-Id: I617c44aa846c1cb561cd065c953574599c593a1b
This reverts commit 75e1da7beb.
Reason for revert: Caused build breakage - b/10429173
Change-Id: I617c44aa846c1cb561cd065c953574599c593a1b