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

Change-Id: I753b3cfca7cf6fa684edb8f7801e3fb104be2643