Hygiene: Remove uninitialised variables to top

Change-Id: I85819a71da9038f449cf07c28d8337fb76678ed9
Merge "Hygiene: Remove uninitialised variables to top"