mTraits is used without been locked
am: e32a1d7c90

Change-Id: If5efb0ed85f4d1efc02dad9c1b1797bda3bd8670