Merge "[Script] Remove unnecessary interface modifiers"