Restore honami and apache?

Change-Id: I2d26134d4e4ff47b672dddafc5a32674af8dfc78