Disable -Wthread-safety-negative am: 62f62f38f4
am: efc980bf12

Change-Id: Ie60b24cf0bb81390b146b75b85381f3a55baa865