Added threadsafe queue. am: 7e3a2a266e
am: 4eea9578e8

Change-Id: I624afeb11bd221bebf970ab28bf406d97482f333