am: 1dbb0355dc * commit '1dbb0355dc89a9f878365ee793ec48f6cb0b1426': fix data race condition BUG: 25819358