This reverts commit 7d13e5b9. Reason for revert: Fixed broken targets Change-Id: Ibfa2641575346675f8210297eaebfbe7d63cf5a5