Maguro / Toro Hybrid conf

Change-Id: Ia10ad198af91561f9ce7ec00557df320e357338b