SQUASH: bootstrap

Change-Id: I20715b3287041d96b58b0d26b2886d41e7227f2d
SQUASH: bootstrap

Change-Id: I343753c4b23fd967e90cba6261f554912bae5fa9