Initialization code cleanup.

Change-Id: I47a8b4bf9a6cc0063d1a6785eaaad641d0659e24
7 files changed