Merge "Fix double initialization call."
am: 6c5c6afea9

Change-Id: I8f1fa90413b1b09e8048a13c3790cd87f6ad697d