build: Optimizations

Change-Id: I23f367b542677aea2b2b1b82a6a4ff708df7e032