Merge "[Script] Remove final modifier from private methods"
am: 8d2b3e7f77

Change-Id: Idda24a2424bd9f3e81de8c1d90d3609816478089