So they can be used by more projects.

Bug: 122835115
Test: manual
Change-Id: Ifda92ea584e80eeffc3fc8b7fcc6c67cae4156d6