Fixed potentially thread unsafe initialization.

Change-Id: I047bcd9358a544723603a069faa234c00ba6b757
2 files changed