Guard against initializing more then once

Change-Id: I346c29ae935faf4a9f4df4b4fc907a87fa370659
Merge "Guard against initializing more then once"