-Os... for now

Change-Id: I965911c358ddd3f69c9430e945b030e0ad4cd31d