Fixes for Dali Kepler M5a Public/Internal API changes