Merge "[Script] Remove unnecessary interface modifiers"
am: 0cb8e36851

Change-Id: Ide6c83bab8271acfba762a7c2c6f8c90b52615a8