Reduce zip size by 5.2 MB

Change-Id: I22d0effbb3c53d081070f84e9c184546eaea3db4