This reverts commit c35fc0e1. Reason for revert: fix broken targets in the internal master. Change-Id: I70447a05ae5b2afa7efc7ab21c0432e651cab1ba