Merge "TIF: Remove unnecessary interface modifiers" into mnc-dev