Optimize for Size

Change-Id: Id8e9ab078dbcedd98d05a4116dddcdc4a2e4dfa6