Simplify after open sourcing repos

Change-Id: Ida62a55275a6dcb2ffa44c2bc078ccfd2da1ef8b
2 files changed