This reverts commit 482ee538. Reason for revert: No longer a build component Change-Id: I960704268e1ded1bcb1ee4b1429bb2badab1af48 Test: manual