Change init

Change-Id: I89cdc4a1b316ef28402787c0c1c5af8a907b9425