mainly to keep the next diff smaller. it'll be large enough as is. Change-Id: Ib8a34520f03539cbf6aa2f0e66cbed05fe1225eb