Merge "Resolving race condition while writing recent taskids" into nyc-mr1-dev am: 769bc6c8b1
am: 9dbdbf461e

Change-Id: I1e1e59ffd721807729bc9692767214d86faf0f90