Framework: Fix merge derps

Change-Id: Ie1ecfef017e5d32fbd6261f1fbc4ef926f1bf898