Add comments for code with race condition

Change-Id: I89faa979ad605c463097e842e1112b2a24adee09