Optimize build

Change-Id: I727927dfcdca816c7221313b2962e10db1a2ebec